Fix non-tls forward-proxy #848
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
karlseguin
commented
Jul 7, 2025
| } | ||
| } | ||
| if (self._request_secure and !self._proxy_secure) { | ||
| if (self._request_secure and !self._proxy_secure and !self._client.isForwardProxy()) { |
Collaborator
Author
There was a problem hiding this comment.
This is the only real change.
sjorsdonkers
reviewed
Jul 7, 2025
| } | ||
| } | ||
| if (self._request_secure and !self._proxy_secure) { | ||
| if (self._request_secure and !self._proxy_secure and !self._client.isForwardProxy()) { |
Contributor
There was a problem hiding this comment.
I believe we would need this to support a secure forward proxy (proxy_tls_config need to be put in scope)
Suggested change
| if (self._request_secure and !self._proxy_secure and !self._client.isForwardProxy()) { | |
| if (self._client.isForwardProxy()) { | |
| if (self._proxy_secure) { | |
| self._connection.?.tls = .{ | |
| .blocking = try tls.client(std.net.Stream{ .handle = socket }, proxy_tls_config), | |
| }; | |
| } | |
| } else if (self._request_secure and !self._proxy_secure) { // handles both insecure connect proxy and no proxy case | |
| self._connection.?.tls = .{ | |
| .blocking = try tls.client(std.net.Stream{ .handle = socket }, tls_config), | |
| }; | |
| } |
Starting to think the refactored version would have been better here anyway.
#815 (comment)
Collaborator
Author
There was a problem hiding this comment.
now it's:
if (
(self._request_secure and !self._proxy_secure) and
(!self._client.isForwardProxy() or self._proxy_secure)
) {
Contributor
There was a problem hiding this comment.
Should the tls_config be changed to point to the right endpoint? if it is the tls for the proxy?
Contributor
There was a problem hiding this comment.
or self._proxy_secure can never make the whole statement true since and !self._proxy_secure is also part of it
sjorsdonkers
approved these changes
Jul 7, 2025
This reverts commit b6132f2.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also renamed
isSimpleProxy->isForwardProxyfor consistent with the proxy type name.